From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 24 Apr 2006 03:29:27 +0000 (+0000)
Subject: Check for invalid serialized objects and return an error condition instead of just... 
X-Git-Tag: 1.31.0-rc.0~57392
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=16461ce7d8346b0183f2b0d8d3b064d23cadd0d1;p=lhc%2Fweb%2Fwiklou.git

Check for invalid serialized objects and return an error condition instead of just dying.
---

diff --git a/includes/Revision.php b/includes/Revision.php
index c289bf784e..e9083a7742 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -530,6 +530,11 @@ class Revision {
 			if( in_array( 'object', $flags ) ) {
 				# Generic compressed storage
 				$obj = unserialize( $text );
+				if ( !is_object( $obj ) ) {
+					// Invalid object
+					wfProfileOut( $fname );
+					return false;
+				}
 				$text = $obj->getText();
 			}